bitkeeper revision 1.1053 (40ed42de9JFsw0T591T5jpnZ82grCw)

Quieten down debug and errors.

diff --git a/tools/python/xen/xend/XendClient.py b/tools/python/xen/xend/XendClient.py
index b09412894bfc456325825fb04969d943e61c1aee..f85c462cf581905f4d31d18d9754b106a92998b5 100644 (file)
--- a/tools/python/xen/xend/XendClient.py
+++ b/tools/python/xen/xend/XendClient.py
@@ -19,6 +19,9 @@ import PrettyPrint
 
 DEBUG = 0
 
+class XendError(RuntimeError):
+    pass
+
 class Foo(httplib.HTTPResponse):
 
     def begin(self):
@@ -118,7 +121,7 @@ def xend_request(url, method, data=None):
     if resp.status in [204, 404]:
         return None
     if resp.status not in [200, 201, 202, 203]:
-        raise RuntimeError(resp.reason)
+        raise XendError(resp.reason)
     pin = sxp.Parser()
     data = resp.read()
     if DEBUG: print "***data" , data

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index c908fda5ab120265c7946255ab6de4fc75dd79b4..385c1dc39019cf1894175050ca798c9444e012ec 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -8,7 +8,7 @@ import sys
 import traceback
 
 from twisted.internet import defer
-defer.Deferred.debug = 1
+#defer.Deferred.debug = 1
 from twisted.internet import reactor
 
 import xen.lowlevel.xc; xc = xen.lowlevel.xc.new()

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 619d5754663b03424e4e955340ea8e5e9154b095..5dff09e388a316e6c8fa503125e784c916868157 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -15,7 +15,7 @@ import sys
 import os
 
 from twisted.internet import defer
-defer.Deferred.debug = 1
+#defer.Deferred.debug = 1
 
 import xen.lowlevel.xc; xc = xen.lowlevel.xc.new()
 import xen.util.ip

diff --git a/tools/python/xen/xend/XendMigrate.py b/tools/python/xen/xend/XendMigrate.py
index 4d19a772ac56b9a29647b0fe27e764715d37e9ca..29cb4bb61674ed3e6aea2b0061a9d75d43dcabae 100644 (file)
--- a/tools/python/xen/xend/XendMigrate.py
+++ b/tools/python/xen/xend/XendMigrate.py
@@ -6,7 +6,7 @@ import time
 
 from twisted.internet import reactor
 from twisted.internet import defer
-defer.Deferred.debug = 1
+#defer.Deferred.debug = 1
 from twisted.internet.protocol import Protocol
 from twisted.internet.protocol import ClientFactory
 

diff --git a/tools/python/xen/xend/server/SrvBase.py b/tools/python/xen/xend/server/SrvBase.py
index 059220c40870394c45414ccd18dd0e26ada71218..6ea92ae6cc15a6dcc781de8fda9bf5b961ae7643 100644 (file)
--- a/tools/python/xen/xend/server/SrvBase.py
+++ b/tools/python/xen/xend/server/SrvBase.py
@@ -8,7 +8,7 @@ import types
 import StringIO
 
 from twisted.internet import defer
-defer.Deferred.debug = 1
+#defer.Deferred.debug = 1
 from twisted.internet import reactor
 from twisted.web import error
 from twisted.web import resource

diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py
index a514b8910851b617b50a3e3034e94c69f19aee5f..c4e562e711ab82d7dd9dff22bf07ea9b901e1990 100644 (file)
--- a/tools/python/xen/xend/server/SrvDaemon.py
+++ b/tools/python/xen/xend/server/SrvDaemon.py
@@ -23,7 +23,7 @@ from twisted.internet import reactor
 from twisted.internet import protocol
 from twisted.internet import abstract
 from twisted.internet import defer
-defer.Deferred.debug = 1
+#defer.Deferred.debug = 1
 
 from xen.lowlevel import xu
 

diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py
index eb1521e1173addc54e37054ef8d4793ad26c4b05..719ea612ff4c302fb5c883d5a010b5c8f02b5b25 100644 (file)
--- a/tools/python/xen/xend/server/SrvDomainDir.py
+++ b/tools/python/xen/xend/server/SrvDomainDir.py
@@ -69,7 +69,7 @@ class SrvDomainDir(SrvDir):
         except Exception, ex:
             print 'op_create> Exception creating domain:'
             traceback.print_exc()
-            req.setResponseCode(http.BAD_REQUEST, "Error creating domain")
+            req.setResponseCode(http.BAD_REQUEST, "Error creating domain: " + str(ex))
             return str(ex)
             #return error.ErrorPage(http.BAD_REQUEST,
             #                       "Error creating domain",
@@ -100,7 +100,7 @@ class SrvDomainDir(SrvDir):
         """Callback to handle errors in deferred domain creation.
         """
         print 'op_create> Deferred Exception creating domain:', err
-        req.setResponseCode(http.BAD_REQUEST, "Error creating domain")
+        req.setResponseCode(http.BAD_REQUEST, "Error creating domain: " + str(err))
         return str(err)
 
     def op_restore(self, op, req):

diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py
index bf51640ee19f4319566a91e052ca5b92b5db0833..a6ca8788d46da15574215b42e723775e5b1b1e2f 100755 (executable)
--- a/tools/python/xen/xend/server/blkif.py
+++ b/tools/python/xen/xend/server/blkif.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
 
 from twisted.internet import defer
-defer.Deferred.debug = 1
+#defer.Deferred.debug = 1
 
 from xen.xend import sxp
 from xen.xend import PrettyPrint

diff --git a/tools/python/xen/xend/server/controller.py b/tools/python/xen/xend/server/controller.py
index a9f416908a0d601a5aed0023cc61a8b148f763de..d422cd2853a167161424e45d158fb784638db4ee 100755 (executable)
--- a/tools/python/xen/xend/server/controller.py
+++ b/tools/python/xen/xend/server/controller.py
@@ -4,7 +4,7 @@ for a domain.
 """
 
 from twisted.internet import defer
-defer.Deferred.debug = 1
+#defer.Deferred.debug = 1
 
 import channel
 from messages import msgTypeName, printMsg

diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py
index 49f9865747c0890d356ae3ef32c01ed292130936..415ab2409bb73bdd4cdd032de1f1bf846b0fab9b 100755 (executable)
--- a/tools/python/xen/xend/server/netif.py
+++ b/tools/python/xen/xend/server/netif.py
@@ -3,7 +3,7 @@
 import random
 
 from twisted.internet import defer
-defer.Deferred.debug = 1
+#defer.Deferred.debug = 1
 
 from xen.xend import sxp
 from xen.xend import PrettyPrint

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 08773ea2f7ef0d07e424bf42f01ed5d942297f5d..223a9f560214ff829149d683a2f08d0014cfbfbf 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -7,7 +7,7 @@ import sys
 
 from xen.xend import sxp
 from xen.xend import PrettyPrint
-from xen.xend.XendClient import server
+from xen.xend.XendClient import server, XendError
 
 from xen.util import console_client
 
@@ -352,13 +352,21 @@ def preprocess(opts, vals):
          
 def make_domain(opts, config):
     """Create, build and start a domain.
-    Returns: pair: [int] the ID of the new domain, [int] console port
+
+    @param opts:   options
+    @param config: configuration
+    @return: domain id, console port
+    @rtype:  (int, int)
     """
-    if opts.vals.load:
-        filename = os.path.abspath(opts.vals.load)
-        dominfo = server.xend_domain_restore(filename, config)
-    else:
-        dominfo = server.xend_domain_create(config)
+
+    try:
+        if opts.vals.load:
+            filename = os.path.abspath(opts.vals.load)
+            dominfo = server.xend_domain_restore(filename, config)
+        else:
+            dominfo = server.xend_domain_create(config)
+    except XendError, ex:
+        opts.err(str(ex))
 
     dom = int(sxp.child_value(dominfo, 'id'))
     console_info = sxp.child(dominfo, 'console')
@@ -369,7 +377,7 @@ def make_domain(opts, config):
     
     if server.xend_domain_unpause(dom) < 0:
         server.xend_domain_destroy(dom)
-        opts.err("Failed to start domain %d" % dom)
+        opts.err("Failed to unpause domain %d" % dom)
     opts.info("Started domain %d, console on port %d"
               % (dom, console_port))
     return (dom, console_port)
@@ -397,9 +405,9 @@ def main(argv):
     if opts.vals.dryrun:
         PrettyPrint.prettyprint(config)
     else:
-        (d, c) = make_domain(opts, config)
+        (dom, console) = make_domain(opts, config)
         if opts.vals.console_autoconnect:
-            console_client.connect('localhost', c)
+            console_client.connect('localhost', console)
         
 if __name__ == '__main__':
     main(sys.argv)